From 84739dde99b86737a09800d11a81e2ef715c2923 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Tue, 28 May 2019 17:25:45 +0000 Subject: [PATCH] GDK W32: Fix indentation and placate GCC --- gdk/win32/gdksurface-win32.c | 107 +++++++++++++++++------------------ 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 4e9e525bc9..89402d576d 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -1101,6 +1101,9 @@ static void gdk_win32_surface_move (GdkSurface *window, gint x, gint y) { + RECT outer_rect; + GdkWin32Surface *impl; + g_return_if_fail (GDK_IS_SURFACE (window)); if (GDK_SURFACE_DESTROYED (window)) @@ -1112,33 +1115,31 @@ gdk_win32_surface_move (GdkSurface *window, if (window->state & GDK_SURFACE_STATE_FULLSCREEN) return; - { - RECT outer_rect; - GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); - - get_outer_rect (window, window->width, window->height, &outer_rect); + impl = GDK_WIN32_SURFACE (window); + get_outer_rect (window, window->width, window->height, &outer_rect); - adjust_for_gravity_hints (window, &outer_rect, &x, &y); + adjust_for_gravity_hints (window, &outer_rect, &x, &y); - GDK_NOTE (MISC, g_print ("... SetWindowPos(%p,NULL,%d,%d,0,0," - "NOACTIVATE|NOSIZE|NOZORDER)\n", - GDK_SURFACE_HWND (window), - (x - _gdk_offset_x) * impl->surface_scale, - (y - _gdk_offset_y) * impl->surface_scale)); + GDK_NOTE (MISC, g_print ("... SetWindowPos(%p,NULL,%d,%d,0,0," + "NOACTIVATE|NOSIZE|NOZORDER)\n", + GDK_SURFACE_HWND (window), + (x - _gdk_offset_x) * impl->surface_scale, + (y - _gdk_offset_y) * impl->surface_scale)); - API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), - SWP_NOZORDER_SPECIFIED, - (x - _gdk_offset_x) * impl->surface_scale, - (y - _gdk_offset_y) * impl->surface_scale, - 0, 0, - SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER)); - } + API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), + SWP_NOZORDER_SPECIFIED, + (x - _gdk_offset_x) * impl->surface_scale, + (y - _gdk_offset_y) * impl->surface_scale, + 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER)); } static void gdk_win32_surface_resize (GdkSurface *window, gint width, gint height) { + RECT outer_rect; + g_return_if_fail (GDK_IS_SURFACE (window)); if (GDK_SURFACE_DESTROYED (window)) @@ -1155,25 +1156,21 @@ gdk_win32_surface_resize (GdkSurface *window, if (window->state & GDK_SURFACE_STATE_FULLSCREEN) return; - { - RECT outer_rect; - - get_outer_rect (window, width, height, &outer_rect); + get_outer_rect (window, width, height, &outer_rect); - GDK_NOTE (MISC, g_print ("... SetWindowPos(%p,NULL,0,0,%ld,%ld," - "NOACTIVATE|NOMOVE|NOZORDER)\n", - GDK_SURFACE_HWND (window), - outer_rect.right - outer_rect.left, - outer_rect.bottom - outer_rect.top)); + GDK_NOTE (MISC, g_print ("... SetWindowPos(%p,NULL,0,0,%ld,%ld," + "NOACTIVATE|NOMOVE|NOZORDER)\n", + GDK_SURFACE_HWND (window), + outer_rect.right - outer_rect.left, + outer_rect.bottom - outer_rect.top)); - API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), - SWP_NOZORDER_SPECIFIED, - 0, 0, - outer_rect.right - outer_rect.left, - outer_rect.bottom - outer_rect.top, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER)); - window->resize_count += 1; - } + API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), + SWP_NOZORDER_SPECIFIED, + 0, 0, + outer_rect.right - outer_rect.left, + outer_rect.bottom - outer_rect.top, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER)); + window->resize_count += 1; } static void @@ -1183,6 +1180,9 @@ gdk_win32_surface_move_resize_internal (GdkSurface *window, gint width, gint height) { + RECT outer_rect; + GdkWin32Surface *impl; + g_return_if_fail (GDK_IS_SURFACE (window)); if (GDK_SURFACE_DESTROYED (window)) @@ -1200,30 +1200,27 @@ gdk_win32_surface_move_resize_internal (GdkSurface *window, GDK_SURFACE_HWND (window), width, height, x, y)); - { - RECT outer_rect; - GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); + impl = GDK_WIN32_SURFACE (window); - get_outer_rect (window, width, height, &outer_rect); + get_outer_rect (window, width, height, &outer_rect); - adjust_for_gravity_hints (window, &outer_rect, &x, &y); + adjust_for_gravity_hints (window, &outer_rect, &x, &y); - GDK_NOTE (MISC, g_print ("... SetWindowPos(%p,NULL,%d,%d,%ld,%ld," - "NOACTIVATE|NOZORDER)\n", - GDK_SURFACE_HWND (window), - (x - _gdk_offset_x) * impl->surface_scale, - (y - _gdk_offset_y) * impl->surface_scale, - outer_rect.right - outer_rect.left, - outer_rect.bottom - outer_rect.top)); + GDK_NOTE (MISC, g_print ("... SetWindowPos(%p,NULL,%d,%d,%ld,%ld," + "NOACTIVATE|NOZORDER)\n", + GDK_SURFACE_HWND (window), + (x - _gdk_offset_x) * impl->surface_scale, + (y - _gdk_offset_y) * impl->surface_scale, + outer_rect.right - outer_rect.left, + outer_rect.bottom - outer_rect.top)); - API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), - SWP_NOZORDER_SPECIFIED, - (x - _gdk_offset_x) * impl->surface_scale, - (y - _gdk_offset_y) * impl->surface_scale, - outer_rect.right - outer_rect.left, - outer_rect.bottom - outer_rect.top, - SWP_NOACTIVATE | SWP_NOZORDER)); - } + API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), + SWP_NOZORDER_SPECIFIED, + (x - _gdk_offset_x) * impl->surface_scale, + (y - _gdk_offset_y) * impl->surface_scale, + outer_rect.right - outer_rect.left, + outer_rect.bottom - outer_rect.top, + SWP_NOACTIVATE | SWP_NOZORDER)); } static void -- 2.30.2